diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | externals/SDL | 0 | ||||
| -rw-r--r-- | src/core/file_sys/vfs_real.cpp | 3 | ||||
| -rw-r--r-- | src/input_common/drivers/mouse.cpp | 5 |
4 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f5ef0ef50..26e93b038 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -489,7 +489,7 @@ if (ENABLE_SDL2) if (YUZU_USE_BUNDLED_SDL2) # Detect toolchain and platform if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) - set(SDL2_VER "SDL2-2.28.0") + set(SDL2_VER "SDL2-2.28.1") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") endif() diff --git a/externals/SDL b/externals/SDL -Subproject 491fba1d06a4810645092b2559b9cc94abeb23b +Subproject 116a5344ff4e8b8166eac2db540cd6578b4ba02 diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index b0515ec05..1c706e4d8 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp @@ -283,7 +283,8 @@ std::size_t RealVfsFile::GetSize() const { if (size) { return *size; } - return FS::GetSize(path); + auto lk = base.RefreshReference(path, perms, *reference); + return reference->file ? reference->file->GetSize() : 0; } bool RealVfsFile::Resize(std::size_t new_size) { diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index dac29c78f..9fb824baf 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -160,8 +160,9 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { last_mouse_change.y += mouse_change.y * y_sensitivity; // Bind the mouse change to [0 <= deadzone_counterweight <= 1.0] - if (last_mouse_change.Length() < deadzone_counterweight) { - last_mouse_change /= last_mouse_change.Length(); + const float length = last_mouse_change.Length(); + if (length < deadzone_counterweight && length != 0.0f) { + last_mouse_change /= length; last_mouse_change *= deadzone_counterweight; } |